gtk/gtkcellview.c (gtk_cell_view_cell_layout_reorder) plug leak wrt. link

2008-02-11  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtkcellview.c (gtk_cell_view_cell_layout_reorder)
	* gtk/gtkiconview.c (gtk_icon_view_cell_layout_reorder): plug leak
	wrt. link deletion from list; contination of fix for #503569.

svn path=/trunk/; revision=19513

diff --git a/ChangeLog b/ChangeLog
index f0abdb3a97baa46f992fe4355ebfab9395ea9e5d..815b20446c7e77e2e07a57d0f06ce7a9ba474e04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-11  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_cell_layout_reorder)
+       * gtk/gtkiconview.c (gtk_icon_view_cell_layout_reorder): plug leak
+       wrt. link deletion from list; contination of fix for #503569.
+
 2008-02-11  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentchoosermenu.c:

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index baa8776e867b3ff44b7cb3b88f0609a530bd728d..45a4b16fa7b0f5d03d269bae1bcb30202a25b302 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -720,7 +720,7 @@ gtk_cell_view_cell_layout_reorder (GtkCellLayout   *layout,
 
   g_return_if_fail (link != NULL);
 
-  cellview->priv->cell_list = g_list_remove_link (cellview->priv->cell_list,
+  cellview->priv->cell_list = g_list_delete_link (cellview->priv->cell_list,
                                                   link);
   cellview->priv->cell_list = g_list_insert (cellview->priv->cell_list,
                                              info, position);

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index b78ee7639df371efd56dbf9f7a749a563d51efa6..6ad5f05ea7ea0575b83e6373539e6407f61fad9b 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -4478,8 +4478,8 @@ gtk_icon_view_cell_layout_reorder (GtkCellLayout   *layout,
 
   g_return_if_fail (link != NULL);
 
-  icon_view->priv->cell_list = g_list_remove_link (icon_view->priv->cell_list,
-                                                  link);
+  icon_view->priv->cell_list = g_list_delete_link (icon_view->priv->cell_list,
+                                                   link);
   icon_view->priv->cell_list = g_list_insert (icon_view->priv->cell_list,
                                              info, position);